auto merge of #603 : brson/cargo/win, r=alexcrichton,alexcrichton,me
authorbors <bors@rust-lang.org>
Fri, 19 Sep 2014 01:43:36 +0000 (01:43 +0000)
committerbors <bors@rust-lang.org>
Fri, 19 Sep 2014 01:43:36 +0000 (01:43 +0000)

Trivial merge